Use gslice for GtkBorder (#383557).

2006-12-24  Behdad Esfahbod  <behdad@gnome.org>

        * gtk/gtkstyle.c (gtk_border_copy), (gtk_border_free): Use gslice for
        GtkBorder (#383557).

diff --git a/ChangeLog b/ChangeLog
index 2078b6cc6251ad700e51e5f61d59b3415651b816..07aa9703e01f3ed581cd4195f4280bd6766b4822 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-24  Behdad Esfahbod  <behdad@gnome.org>
+
+       * gtk/gtkstyle.c (gtk_border_copy), (gtk_border_free): Use gslice for
+       GtkBorder (#383557).
+
 2006-12-24  Behdad Esfahbod  <behdad@gnome.org>
 
        Bug 340141 – Update to Pango 1.16 API

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index e10f743bd332c32e14c2282f1dc8f70056d3578c..b7d1d8f0a8d919700e2eebd1604973261cb7eba0 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -6407,7 +6407,15 @@ gtk_paint_resize_grip (GtkStyle      *style,
 GtkBorder *
 gtk_border_copy (const GtkBorder *border)
 {
-  return (GtkBorder *)g_memdup (border, sizeof (GtkBorder));
+  GtkBorder *ret;
+
+  g_return_val_if_fail (border != NULL, NULL);
+
+  ret = g_slice_new (GtkBorder);
+
+  *ret = *border;
+
+  return ret;
 }
 
 /**
@@ -6419,7 +6427,7 @@ gtk_border_copy (const GtkBorder *border)
 void
 gtk_border_free (GtkBorder *border)
 {
-  g_free (border);
+  g_slice_free (GtkBorder, border);
 }
 
 GType